how to resolve conflicts between developer and qa